[sheepdog-users] [PATCH] dog: initialize a reference count of check/repair work correctly

Liu Yuan namei.unix at gmail.com
Thu Dec 19 09:45:34 CET 2013


On Thu, Dec 19, 2013 at 09:27:44AM +0100, Valerio Pachera wrote:
> 2013/12/19 Liu Yuan <namei.unix at gmail.com>
> 
> > Valerio, for temepararily fixing the problem, you can
> > type 'autoreconf -f -i' before ./configure and make
> >
> 
> This should be master branch
> 0.7.0_263_g6d6ae16
> 
> Now I wanted to switch to 'devel', re-build and check the version but I
> stopped before.
> How is it possible that 2 nodes are 'ahed' of 2 commits
> 
> parallel-ssh -i -h pssh.conf 'cd /usr/src/sheepdog-0.8/; git pull'
> [1] 09:23:24 [SUCCESS] test006
> Already up-to-date.
> [2] 09:23:24 [SUCCESS] test005
> Already up-to-date.
> [3] 09:23:24 [SUCCESS] test004
> Already up-to-date.
> [4] 09:23:24 [SUCCESS] test007
> Already up-to-date.
> 
> parallel-ssh -i -h pssh.conf 'cd /usr/src/sheepdog-0.8/; git checkout devel'
> [1] 09:23:30 [SUCCESS] test006
> Your branch is ahead of 'origin/devel' by 2 commits.
> Stderr: Switched to branch 'devel'
> [2] 09:23:30 [SUCCESS] test004
> Your branch is ahead of 'origin/devel' by 2 commits.

It most happens when your don't git pull on it.


> Stderr: Switched to branch 'devel'
> [3] 09:23:30 [SUCCESS] test005
> Stderr: Switched to branch 'devel'
> [4] 09:23:30 [SUCCESS] test007
> Stderr: Switched to branch 'devel'
> 
> 
> Do I re-download the sources to start from scratch?

No, just 'git reset --hard origin/devel' for devel branch,
git reset --hard origin/master for master branch

Thanks
Yuan



More information about the sheepdog-users mailing list