You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/10/13 20:56:08 UTC

[2/2] allura git commit: Merge remote-tracking branch 'dave/docker_npm_pwd'

Merge remote-tracking branch 'dave/docker_npm_pwd'


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/00110b12
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/00110b12
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/00110b12

Branch: refs/heads/master
Commit: 00110b12ed58a44a95104d8579721bb6461bdada
Parents: 77c45da a1aab22
Author: Heith Seewald <hs...@hsmb.local>
Authored: Tue Oct 13 14:52:11 2015 -0400
Committer: Heith Seewald <hs...@hsmb.local>
Committed: Tue Oct 13 14:52:11 2015 -0400

----------------------------------------------------------------------
 Allura/allura/command/create_neighborhood.py   |  5 +++++
 Allura/docs/getting_started/administration.rst |  4 ++++
 Allura/docs/getting_started/installation.rst   | 20 +++++++++++++-------
 Dockerfile                                     | 13 +++++++++----
 docker-compose.yml                             |  8 ++++----
 5 files changed, 35 insertions(+), 15 deletions(-)
----------------------------------------------------------------------