]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 119f06f c3ca7ad)
Merge remote-tracking branch 'upstream/pull/10543/head'
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 2 Aug 2016 19:40:49 +0000 (15:40 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 2 Aug 2016 19:40:49 +0000 (15:40 -0400)
* upstream/pull/10543/head:
  vstart.sh: only delete conf if -n


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.