diff options
author | Joan Touzet <wohali@users.noreply.github.com> | 2018-03-27 16:42:37 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-27 16:42:37 -0400 |
commit | 25de7b5595fa09b42a9e84e1b99f7cb2c0a7f50e (patch) | |
tree | f95b39b19412af2ad2e65d84b4c226a2b4d0b82a | |
parent | c30067352abd0ef9efb1dcf7f3fdb7e78829f6b3 (diff) | |
parent | 266c56b79172ad0748241f6e0ecf74dbb89a645b (diff) | |
download | couchdb-25de7b5595fa09b42a9e84e1b99f7cb2c0a7f50e.tar.gz |
Merge pull request #1240 from apache/cleanup
Various top-level directory cleanups
-rw-r--r-- | COMMITTERS.md | 51 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | Makefile.win | 2 | ||||
-rw-r--r-- | Vagrantfile | 69 | ||||
-rwxr-xr-x | build-aux/introspect (renamed from introspect) | 0 | ||||
-rw-r--r-- | license.skip | 204 |
6 files changed, 8 insertions, 320 deletions
diff --git a/COMMITTERS.md b/COMMITTERS.md index 7412efcb5..3b25283e3 100644 --- a/COMMITTERS.md +++ b/COMMITTERS.md @@ -2,49 +2,10 @@ Apache CouchDB COMMITTERS ========================= Committers are given a binding vote in certain project decisions, as well as -write access to public project infrastructure. The following people were -elected as a committer in recognition of their commitment to the project. We -mean this in the sense of being loyal to the project and its interests. +write access to public project infrastructure. Committers are elected to the +project in recognition of their committment to Apache CouchDB. We mean this in +the sense of being loyal to the project and its interests. - * Damien Katz <damien@apache.org> - * Jan Lehnardt <jan@apache.org> - * Noah Slater <nslater@apache.org> - * Christopher Lenz <cmlenz@apache.org> - * J. Chris Anderson <jchris@apache.org> - * Paul Joseph Davis <davisp@apache.org> - * Adam Kocoloski <kocolosk@apache.org> - * Jason Davies <jasondavies@apache.org> - * Mark Hammond <mhammond@apache.org> - * BenoƮt Chesneau <benoitc@apache.org> - * Filipe Manana <fdmanana@apache.org> - * Robert Newson <rnewson@apache.org> - * Randall Leeds <randall@apache.org> - * Bob Dionne <bitdiddle@apache.org> - * Dave Cottlehuber <dch@apache.org> - * Jason Smith <jhs@apache.org> - * Joan Touzet <wohali@apache.org> - * Dale Harvey <dale@apache.org> - * Dirkjan Ochtman <djc@apache.org> - * Alexander Shorin <kxepal@apache.org> - * Garren Smith <garren@apache.org> - * Sue Lockwood <deathbear@apache.org> - * Andy Wenk <andywenk@apache.org> - * Klaus Trainer <klaus_trainer@apache.org> - * Benjamin Young <bigbluehat@apache.org> - * Robert Kowalski <robertkowalski@apache.org> - * Diana Thayer <garbados@apache.org> - * Gianugo Rabellino <gianugo@apache.org> - * Jenn Schiffer <jenn@apache.org> - * Lena Reinhard <lena@apache.org> - * Simon Metson <metson@apache.org> - * Mike Wallace <mikewallace@apache.org> - * Nick North <nicknorth@apache.org> - * Ryan Ramage <ryanramage@apache.org> - * Sebastian Rothbucher <sebastianro@apache.org> - * Ted Leung <twl@apache.org> - * Wendall Cada <wendallc@apache.org> - * Benjamin Bastian <bbastian@apache.org> - * Ben Keen <benkeen@apache.org> - * Maria Andersson <mia@apache.org> - * Michelle Phung <michellep@apache.org> - * Clemens Stolle <klaemo@apache.org> +A full list of committers elected to the project is available at: + + https://people.apache.org/committers-by-project.html#couchdb @@ -270,7 +270,7 @@ dialyze: .rebar # target: introspect - Check for commits difference between rebar.config and repository introspect: @$(REBAR) -r update-deps - @./introspect + @build-aux/introspect ################################################################################ # Distributing diff --git a/Makefile.win b/Makefile.win index 7ff0ab5c5..91f91a548 100644 --- a/Makefile.win +++ b/Makefile.win @@ -141,7 +141,7 @@ dialyze: .rebar # target: introspect - Check for commits difference between rebar.config and repository introspect: @$(REBAR) -r update-deps - @escript .\introspect + @escript build-aux\introspect ################################################################################ diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index b7634a212..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,69 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -BOX_NAME = ENV['BOX_NAME'] || "ubuntu" -BOX_URI = ENV['BOX_URI'] || "http://files.vagrantup.com/precise64.box" -AWS_REGION = ENV['AWS_REGION'] || "us-east-1" -AWS_AMI = ENV['AWS_AMI'] || "ami-d0f89fb9" - -Vagrant::Config.run do |config| - # Setup virtual machine box. This VM configuration code is always executed. - config.vm.box = BOX_NAME - config.vm.box_url = BOX_URI - - # Install couchdb dependencies if deployment was not done - if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty? - # install build-essential - pkg_cmd = "apt-get update -qq; apt-get install -q -y build-essential git " \ - "autoconf autoconf-archive gnu-standards help2man; " - - # Install erlang - pkg_cmd << "apt-get install -q -y erlang-base erlang-dev " \ - "erlang-manpages erlang-eunit erlang-nox erlang-xmerl erlang-inets; " - - # couchdb developper dependencies - pkg_cmd << "apt-get install -q -y libmozjs185-dev libicu-dev " \ - "curl libcurl4-gnutls-dev libtool; " - - # doc dependencies - pkg_cmd << "apt-get install -q -y help2man python-sphinx python-pip; " \ - "pip install -U pygments; " - - config.vm.provision :shell, :inline => pkg_cmd - end -end - - -# Providers were added on Vagrant >= 1.1.0 -Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config| - config.vm.provider :aws do |aws, override| - aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"] - aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"] - aws.keypair_name = ENV["AWS_KEYPAIR_NAME"] - override.ssh.private_key_path = ENV["AWS_SSH_PRIVKEY"] - override.ssh.username = "ubuntu" - aws.region = AWS_REGION - aws.ami = AWS_AMI - aws.instance_type = "t1.micro" - end - - config.vm.provider :rackspace do |rs| - config.ssh.private_key_path = ENV["RS_PRIVATE_KEY"] - rs.username = ENV["RS_USERNAME"] - rs.api_key = ENV["RS_API_KEY"] - rs.public_key_path = ENV["RS_PUBLIC_KEY"] - rs.flavor = /512MB/ - rs.image = /Ubuntu/ - end - - config.vm.provider :virtualbox do |vb| - config.vm.box = BOX_NAME - config.vm.box_url = BOX_URI - end - - config.vm.provider :lxc do |lxc| - config.vm.box = BOX_NAME - config.vm.box_url = BOX_URI - lxc.customize 'cgroup.memory.limit_in_bytes', '1024M' - end -end diff --git a/introspect b/build-aux/introspect index 9b527455f..9b527455f 100755 --- a/introspect +++ b/build-aux/introspect diff --git a/license.skip b/license.skip deleted file mode 100644 index 35f91e13c..000000000 --- a/license.skip +++ /dev/null @@ -1,204 +0,0 @@ -\/\.git\/ -\.gitignore -^.*.DS_Store -^.*.beam -^AUTHORS -^BUGS.md -^COMMITTERS.md -^CHANGES -^DEVELOPERS -^DEVELOPERS.gz -^INSTALL.md -^INSTALL.Unix.md -^INSTALL.Unix.md.gz -^INSTALL.Windows.md -^INSTALL.Windows.md.gz -^INSTALL.gz -^LICENSE.gz -^Makefile -^Makefile.in -^NEWS -^NOTICE -^README -^README.rst -^README-DEV.md -^THANKS -^aclocal.m4 -^apache-couchdb-.* -^autom4te.cache/.* -^bin/Makefile -^bin/Makefile.in -^bin/couchdb.1 -^bin/couchjs.1 -^bin/erlang-version.escript -^build-aux/.* -^config..* -^configure -^couchdb.stderr -^couchdb.stdout -^cover/.*.coverdata -^cover/.*.html -^erl_crash.dump -^dev/lib/.* -^dev/logs/.* -^etc/Makefile -^etc/Makefile.in -^etc/couchdb/Makefile -^etc/couchdb/Makefile.in -^etc/couchdb/default.* -^etc/couchdb/local.* -^etc/default/Makefile -^etc/default/Makefile.in -^etc/default/couchdb -^etc/init/Makefile -^etc/init/Makefile.in -^etc/launchd/Makefile -^etc/launchd/Makefile.in -^etc/launchd/org.apache.couchdb.plist -^etc/logrotate.d/Makefile -^etc/logrotate.d/Makefile.in -^etc/logrotate.d/couchdb.* -^etc/windows/Makefile -^etc/windows/README.txt.tpl -^libtool -^license.skip -^m4/.* -^rel/overlay/etc/default.* -^rel/overlay/etc/local.* -^share/Makefile -^share/Makefile.in -^share/server/json2.js -^share/server/mimeparse.js -^share/server/coffee-script.js -^share/www/favicon.ico -^share/www/image/.* -^share/www/script/jquery..* -^share/www/script/json2.js -^share/www/script/jspec/.* -^share/www/script/sha1.js -^share/www/script/base64.js -^share/www/script/test/lorem.* -^share/www/style/jquery-ui-1.8.11.custom.css -^share/www/fauxton/img/.* -^share/www/fauxton/js/ace/mode-javascript.js -^share/www/fauxton/js/ace/mode-json.js -^share/www/fauxton/js/ace/theme-crimson_editor.js -^share/www/fauxton/js/ace/worker-javascript.js -^share/www/fauxton/js/ace/worker-json.js -^src/Makefile -^src/Makefile.in -^src/chttpd/ebin/chttpd.app -^src/config/ebin/config.app -^src/couch/ebin/couch.app -^src/couch/ebin/.*.beam -^src/couch/priv/.*.so -^src/couch/priv/couch_js/.*.o -^src/couch/priv/icu_driver/.*.o -^src/couch/priv/couchjs -^src/couch/priv/couchspawnkillable -^src/couch/priv/stat_descriptions.cfg -^src/couch_index/Makefile -^src/couch_index/Makefile.in -^src/couch_index/ebin/.*.beam -^src/couch_index/ebin/couch_index.app -^src/couch_mrview/Makefile -^src/couch_mrview/Makefile.in -^src/couch_mrview/ebin/.*.beam -^src/couch_mrview/ebin/couch_mrview.app -^src/couch_plugins/README.md -^src/couch_plugins/Makefile -^src/couch_plugins/Makefile.in -^src/couch_plugins/ebin/.*.beam -^src/couch_replicator/Makefile -^src/couch_replicator/Makefile.in -^src/couch_replicator/README.md -^src/couch_replicator/ebin/.*.beam -^src/couch/.*.beam -^src/couch/.deps/.* -^src/couch/Makefile -^src/couch/Makefile.in -^src/couch/couch.app.* -^src/couch/priv/.*.o -^src/couch/priv/.deps/.* -^src/couch/priv/Makefile -^src/couch/priv/Makefile.in -^src/couch/priv/couch_icu_driver.la -^src/couch/priv/couchjs -^src/couch/priv/couchspawnkillable -^src/couch/priv/stat_descriptions.cfg -^src/couch/priv/icu_driver/.deps/.dirstamp -^src/couch/priv/icu_driver/.dirstamp -^src/couchjs-node/package.json -^src/couchjs-node/sandbox.js -^src/couchjs-node/README.md -^src/couchjs-node/Makefile -^src/couchjs-node/Makefile.in -^src/couch_dbupdates -^src/ejson/.* -^src/fauxton/app/addons/config/assets/less/config.less -^src/fauxton/assets/css/codemirror.css -^src/fauxton/assets/css/nv.d3.css -^src/fauxton/assets/img/.* -^src/fauxton/assets/js/libs/.*.js -^src/fauxton/assets/js/libs/ace/.*.js -^src/fauxton/assets/js/libs/ace/snippets/.*.js -^src/fauxton/assets/js/plugins/.*.js -^src/fauxton/assets/js/plugins/zeroclipboard/ZeroClipboard.swf -^src/fauxton/assets/less/bootstrap/.*.less -^src/fauxton/assets/less/bootstrap/tests/css-tests.css -^src/fauxton/assets/less/bootstrap/tests/buttons.html -^src/fauxton/favicon.ico -^src/fauxton/package.json -^src/fauxton/extensions.md -^src/fauxton/readme.md -^src/fauxton/writing_addons.md -^src/fauxton/TODO.md -^src/fauxton/CONTRIBUTING.md -^src/fauxton/settings.json.* -^src/fauxton/test/test.config.underscore -^src/fauxton/test/mocha/chai.js -^src/fauxton/test/mocha/mocha.css -^src/fauxton/test/mocha/mocha.js -^src/fauxton/test/mocha/sinon.js -^src/fauxton/test/mocha/sinon-chai.js -^src/fauxton/tasks/addon/rename.json -^src/fauxton/assets/lib/ace/.* -^src/fauxton/app/addons/pouchdb/pouch.collate.js -^src/fauxton/app/addons/pouchdb/pouchdb.mapreduce.js -^src/couch_replicator/ebin/couch_replicator.app -^src/ddoc_cache/ebin/ddoc_cache.app -^src/ddoc_cache/README.md -^src/ets_lru/ebin/.*.beam -^src/ets_lru/ebin/ets_lru.app -^src/ejson/.* -^src/fabric/ebin/.*.beam -^src/fabric/ebin/fabric.app -^src/ibrowse/.* -^src/jiffy/.* -^src/mem3/ebin/mem3.app -^src/mochiweb/.* -^src/rexi/ebin/.*.beam -^src/rexi/ebin/rexi.app -^src/snappy/.* -^src/twig/ebin/.*.beam -^src/twig/ebin/twig.app -^src/twig/README.md -^src/twig/src/trunc_io.erl -^stamp-h1 -^test/Makefile -^test/Makefile.in -^test/javascript/Makefile -^test/javascript/Makefile.in -^test/local.ini -^test/view_server/Makefile -^test/view_server/Makefile.in -^tmp/.* -^utils/Makefile -^utils/Makefile.in -^var/Makefile -^var/Makefile.in -^Vagrantfile -^share/www/fauxton/Makefile -^share/www/fauxton/Makefile.in -^share/www/Makefile -^share/www/Makefile.in |