Skip to content

Commit

Permalink
Merge pull request #248 from eugeneia/neutron_sync_agent
Browse files Browse the repository at this point in the history
[neutron-sync-agent] Disregard local history, always rebase on origin.
  • Loading branch information
lukego committed Aug 29, 2014
2 parents d0d65bf + 50361d1 commit 8c7416e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/designs/neutron/neutron-sync-agent
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ while true; do
cd $NEUTRON_DIR
git fetch
if ! git diff --quiet origin/master; then
git merge --ff origin/master
git pull --rebase origin master
echo "Generating new configuration"
$NEUTRON2SNABB $NEUTRON_DIR $SNABB_DIR
fi
Expand Down

0 comments on commit 8c7416e

Please sign in to comment.