Shawn Pearce 9954c4e249 Merge branch 'stable-2.9' into stable-2.10 ... Conflicts: gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/RebaseIfNecessary.java gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java Change-Id: Id716ae24401756b9cfbcb46489259c0d9660412a		2014-08-27 17:15:39 -07:00
..
src	Merge branch 'stable-2.9' into stable-2.10	2014-08-27 17:15:39 -07:00
BUCK	Use ban commit REST endpoint in ban-commit SSH command	2014-07-10 13:21:58 +02:00