You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2013/10/07 18:20:53 UTC

[47/47] git commit: updated refs/heads/1.5.x to 797537c

Merge branch 'build-system-fixes-1.5.x' into 1.5.x

* build-system-fixes-1.5.x: (23 commits)
  the last line is intentionally left blank to appease POSIX gods
  [my-first-couchdb-plugin] remove note about ex-Makefile.dist
  move build system edits for my-first-couchdb-plugin to src/
  [my-first-couchdb-plugin] use Apache 2 License
  move erlang-version.escript to EXTRA_DIST
  add erlang-version.escript to bin_SCRIPTS
  update license.skip with generated files
  fix fauxton adds
  fix typo
  add my-first-couchdb-plugin .gitignore
  remove more accidental edits
  remove accidental edit
  advise renaming the Makefile
  custom Makefile for my-first-couchdb-plugin
  add src/couchjs-node/Makedile to configure.ac
  trailing spaces
  set up my-first-couchdb-plugin with EXTRA_DIST
  set up couchjs-node with EXTRA_DIST
  add fauxton dist to Makefile
  add plugins.html & pagination.rst to Makefiles
  ...


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/797537cc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/797537cc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/797537cc

Branch: refs/heads/1.5.x
Commit: 797537cc0e7ac2c63af233793cc9fd471708fa46
Parents: 5369e41 100b182
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Oct 7 18:19:26 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Mon Oct 7 18:19:26 2013 +0200

----------------------------------------------------------------------
 .gitignore                                      |   3 +-
 bin/Makefile.am                                 |   2 +-
 configure.ac                                    |  15 +-
 license.skip                                    |   7 +
 share/Makefile.am                               |  20 ++
 share/doc/build/Makefile.am                     |   2 +
 src/Makefile.am                                 |  12 +-
 src/couch_plugins/Makefile.am                   |   2 +-
 src/couchjs-node/Makefile.am                    |  24 +++
 src/my-first-couchdb-plugin/.gitignore          |   1 +
 src/my-first-couchdb-plugin/Makefile            |  38 ++++
 src/my-first-couchdb-plugin/README.md           | 196 +++++++++++++++++++
 .../priv/default.d/my_first_couchdb_plugin.ini  |   0
 .../src/my_first_couchdb_plugin.app.src         |  21 ++
 .../src/my_first_couchdb_plugin.erl             |  18 ++
 .../test/my_first_couchdb_plugin_tests.erl      |  15 ++
 16 files changed, 365 insertions(+), 11 deletions(-)
----------------------------------------------------------------------