[Pkg-mongodb-maintainers] [pkg-mongodb] 39/394: Merge commit 'upstream/1.4.0'
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Wed Sep 21 13:57:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository pkg-mongodb.
commit 6dcbb54ae1f145773b8864228006e2edcafca3b5
Merge: 01ba715 0ca01a9
Author: Antonin Kral <a.kral at bobek.cz>
Date: Thu Mar 25 19:28:41 2010 +0100
Merge commit 'upstream/1.4.0'
Conflicts:
debian/changelog
debian/control
debian/init.d
debian/mongodb.conf
debian/rules
.gitignore | 9 +-
APACHE-2.0.txt | 202 ++
README | 11 +
SConstruct | 213 +-
buildscripts/__init__.py | 5 +-
buildscripts/bb.py | 2 +-
buildscripts/cleanbb.py | 43 +
buildscripts/confluence_export.py | 82 +
buildscripts/frob_version.py | 69 +
buildscripts/hacks_mandriva.py | 9 +
buildscripts/hacks_ubuntu.py | 2 +-
buildscripts/makedist.py | 799 ++++++
buildscripts/s3md5.py | 48 +
buildscripts/utils.py | 47 +
client/clientOnly.cpp | 11 +-
client/connpool.cpp | 29 +-
client/connpool.h | 13 +-
client/dbclient.cpp | 75 +-
client/dbclient.h | 65 +-
.../examples/httpClientTest.cpp | 39 +-
client/parallel.cpp | 29 +-
client/parallel.h | 6 +-
client/syncclusterconnection.cpp | 150 +-
client/syncclusterconnection.h | 55 +-
db/background.h | 56 +
db/btree.cpp | 95 +-
db/btree.h | 53 +-
db/btreecursor.cpp | 12 +-
db/client.cpp | 193 +-
db/client.h | 165 +-
db/clientcursor.cpp | 21 +-
db/clientcursor.h | 32 +-
db/cloner.cpp | 122 +-
db/cmdline.cpp | 162 ++
db/cmdline.h | 21 +-
db/commands.cpp | 18 +-
db/commands.h | 19 +-
db/common.cpp | 14 +
db/concurrency.h | 153 +-
db/curop.h | 239 +-
db/cursor.h | 10 +-
db/database.h | 24 +-
db/db.cpp | 239 +-
db/db.h | 147 +-
db/db.sln | 3 -
db/db.vcproj | 134 +-
db/dbcommands.cpp | 614 ++++-
db/dbcommands_admin.cpp | 51 +-
db/dbeval.cpp | 10 +-
db/dbmessage.h | 19 +-
db/dbstats.cpp | 43 -
db/dbstats.h | 44 -
db/dbwebserver.cpp | 305 ++-
db/{storage.h => diskloc.h} | 0
db/driverHelpers.cpp | 63 +
db/extsort.cpp | 45 +-
db/extsort.h | 34 +-
db/flushtest.cpp | 16 +
db/index.cpp | 193 +-
db/index.h | 151 +-
db/index_geo2d.cpp | 1675 ++++++++++++
db/instance.cpp | 391 ++-
db/instance.h | 66 +-
db/introspect.cpp | 3 +-
db/jsobj.cpp | 239 +-
db/jsobj.h | 275 +-
db/jsobjmanipulator.h | 102 +-
db/json.cpp | 25 +-
db/lasterror.cpp | 8 +-
db/lasterror.h | 8 +-
db/matcher.cpp | 554 ++--
db/matcher.h | 76 +-
db/module.cpp | 16 +
db/modules/mms.cpp | 180 +-
db/mr.cpp | 153 +-
db/namespace.cpp | 81 +-
db/namespace.h | 52 +-
db/nonce.cpp | 4 +-
db/pdfile.cpp | 514 ++--
db/pdfile.h | 12 +-
db/query.cpp | 685 +++--
db/query.h | 207 +-
db/queryoptimizer.cpp | 103 +-
db/queryoptimizer.h | 27 +-
db/queryutil.cpp | 464 +++-
db/queryutil.h | 29 +-
db/rec.h | 16 +
db/reccache.cpp | 694 ++---
db/reccache.h | 28 +-
db/reci.h | 18 +-
db/recstore.h | 232 +-
db/repl.cpp | 513 ++--
db/repl.h | 196 +-
db/replset.h | 8 +-
db/scanandorder.h | 2 +-
db/security.cpp | 34 +-
db/security.h | 49 +-
db/security_commands.cpp | 47 +-
db/stats/counters.cpp | 131 +
db/stats/counters.h | 121 +
db/stats/snapshots.cpp | 144 +
db/stats/snapshots.h | 113 +
db/stats/top.cpp | 181 ++
{util => db/stats}/top.h | 77 +-
db/storage.cpp | 16 +
db/update.cpp | 518 ++--
db/update.h | 416 ++-
dbtests/basictests.cpp | 89 +
dbtests/btreetests.cpp | 7 +-
dbtests/clienttests.cpp | 74 +
dbtests/cursortests.cpp | 8 +-
dbtests/dbtests.cpp | 1 +
dbtests/framework.cpp | 2 +
dbtests/jsobjtests.cpp | 239 +-
dbtests/jsontests.cpp | 4 +-
dbtests/jstests.cpp | 130 +-
dbtests/namespacetests.cpp | 11 +-
dbtests/pairingtests.cpp | 2 +-
dbtests/pdfiletests.cpp | 8 +-
dbtests/perf/perftest.cpp | 6 +-
dbtests/queryoptimizertests.cpp | 40 +-
dbtests/querytests.cpp | 196 +-
dbtests/repltests.cpp | 112 +-
dbtests/test.vcproj | 78 +-
dbtests/threadedtests.cpp | 24 +-
dbtests/updatetests.cpp | 25 +-
debian/changelog | 55 +-
debian/control | 12 +-
debian/files | 1 +
debian/init.d | 5 +
debian/mongodb.conf | 98 +
debian/mongodb.upstart | 15 +
debian/mongoimportjson.1 | 45 -
debian/mongostat.1 | 39 +
debian/postinst | 8 +-
debian/rules | 7 +-
debian/ubuntu/mongodb.conf | 13 -
debian/ubuntu/mongodb_settings.conf | 6 -
doxygenConfig | 2 +-
jstests/array_match1.js | 31 +
jstests/arrayfind1.js | 6 +-
jstests/arrayfind2.js | 35 +
jstests/auth/auth1.js | 73 +
jstests/auth/copyauth.js | 29 +
jstests/auth1.js | 2 -
jstests/auth2.js | 5 +
jstests/capped3.js | 22 +-
jstests/capped5.js | 32 +
jstests/clone/clonecollection.js | 89 +-
jstests/copydb2.js | 17 +
jstests/cursor8.js | 23 +-
jstests/dbadmin.js | 7 +-
jstests/dbhash.js | 43 +
jstests/disk/directoryperdb.js | 62 +
jstests/disk/diskfull.js | 7 +-
jstests/disk/newcollection.js | 13 +
jstests/disk/preallocate.js | 10 +-
jstests/disk/repair.js | 18 +
jstests/drop.js | 2 +-
jstests/dropIndex.js | 16 +
jstests/exists2.js | 14 +
jstests/explain2.js | 27 +
jstests/find6.js | 30 +
jstests/find7.js | 8 +
jstests/geo1.js | 41 +
jstests/geo2.js | 43 +
jstests/geo3.js | 87 +
jstests/geo4.js | 10 +
jstests/geo5.js | 18 +
jstests/geo6.js | 23 +
jstests/geo7.js | 20 +
jstests/geo8.js | 13 +
jstests/geo9.js | 28 +
jstests/geo_box1.js | 43 +
jstests/geo_box2.js | 19 +
jstests/geo_circle1.js | 50 +
jstests/geoa.js | 12 +
jstests/geob.js | 35 +
jstests/geoc.js | 24 +
jstests/group2.js | 4 +-
jstests/group3.js | 2 +-
jstests/hint1.js | 4 +-
jstests/in.js | 1 +
jstests/in3.js | 11 +
jstests/inc2.js | 2 +-
jstests/index10.js | 8 +
jstests/index7.js | 26 +-
jstests/index8.js | 13 +-
jstests/index_check2.js | 2 +-
jstests/index_diag.js | 38 +
jstests/indexg.js | 13 +
jstests/insert1.js | 41 +
jstests/json1.js | 4 +-
jstests/mod1.js | 1 +
jstests/mr5.js | 27 +-
jstests/mr_bigobject.js | 41 +
jstests/mr_errorhandling.js | 47 +
jstests/nin.js | 3 +-
jstests/not2.js | 139 +
jstests/parallel/basic.js | 5 +
jstests/parallel/basicPlus.js | 6 +-
jstests/parallel/repl.js | 55 +
jstests/profile1.js | 2 +
jstests/pullall.js | 2 +-
jstests/regex4.js | 2 +-
jstests/regex5.js | 44 +-
jstests/regex6.js | 15 +-
jstests/regex7.js | 26 +
jstests/regex8.js | 19 +
jstests/regex9.js | 11 +
jstests/regex_embed1.js | 25 +
jstests/repl/basic1.js | 45 +
jstests/repl/master1.js | 49 +
jstests/repl/pair1.js | 1 +
jstests/repl/pair3.js | 2 +
jstests/repl/pair4.js | 1 +
jstests/repl/pair5.js | 2 +-
jstests/repl/pair7.js | 85 +
jstests/repl/repl10.js | 38 +
jstests/repl/repl11.js | 59 +
jstests/repl/repl4.js | 8 +
jstests/repl/replacePeer1.js | 25 +-
jstests/repl/replacePeer2.js | 31 +-
jstests/repl/snapshot1.js | 34 +
jstests/repl/snapshot2.js | 50 +
jstests/repl/snapshot3.js | 50 +
jstests/run_program1.js | 19 +
jstests/set5.js | 17 +
jstests/set6.js | 20 +
jstests/set7.js | 40 +
jstests/sharding/findandmodify1.js | 57 +
jstests/sharding/key_many.js | 15 +-
jstests/sharding/moveshard1.js | 6 +-
jstests/sharding/shard2.js | 2 +-
jstests/sharding/sync1.js | 21 +
jstests/sharding/sync2.js | 48 +
jstests/shellkillop.js | 18 +
jstests/shellspawn.js | 6 +-
jstests/slow/indexbg1.js | 117 +
jstests/slow/indexbg2.js | 83 +
jstests/sort5.js | 8 +-
jstests/sort6.js | 38 +
jstests/storefunc.js | 11 +
jstests/testminmax.js | 14 +
jstests/tool/csv1.js | 11 +-
jstests/tool/tool1.js | 4 +-
jstests/type1.js | 1 +
jstests/unset2.js | 23 +
jstests/update6.js | 2 +-
jstests/update_addToSet.js | 41 +
jstests/update_arraymatch1.js | 16 +
jstests/update_arraymatch2.js | 16 +
jstests/update_arraymatch3.js | 17 +
jstests/updatec.js | 14 +
lib/libboost_thread-gcc41-mt-d-1_34_1.a | Bin 0 -> 692920 bytes
mongo.xcodeproj/project.pbxproj | 132 +-
msvc/msvc_scripting.cpp | 16 +
rpm/init.d-mongod | 45 +-
rpm/{mongo.spec => mongo.mdv.spec} | 81 +-
rpm/mongo.spec | 26 +-
rpm/mongod.conf | 5 +-
rpm/mongod.sysconfig | 1 +
s/chunk.cpp | 45 +-
s/chunk.h | 40 +-
s/commands_admin.cpp | 10 +-
s/commands_public.cpp | 158 ++
s/config.cpp | 49 +-
s/config.h | 4 +-
s/cursors.cpp | 16 +
s/cursors.h | 16 +
s/d_logic.cpp | 11 +-
s/d_logic.h | 16 +
s/dbgrid.vcproj | 44 +-
s/request.cpp | 8 +-
s/request.h | 18 +-
s/s_only.cpp | 4 +
s/server.cpp | 132 +-
s/strategy.cpp | 24 +-
s/strategy.h | 16 +
s/strategy_shard.cpp | 16 +
s/strategy_single.cpp | 16 +
s/util.h | 1 +
scripting/engine.cpp | 34 +-
scripting/engine.h | 14 +-
scripting/engine_spidermonkey.cpp | 92 +-
scripting/engine_spidermonkey.h | 20 +-
scripting/sm_db.cpp | 181 +-
scripting/utils.cpp | 52 +
scripting/v8_db.cpp | 210 +-
scripting/v8_db.h | 6 +
scripting/v8_wrapper.cpp | 109 +-
scripting/v8_wrapper.h | 4 +-
shell/collection.js | 72 +-
shell/db.js | 30 +-
shell/dbshell.cpp | 65 +-
shell/mongo.js | 2 +-
shell/mongo_vstudio.cpp | 2797 ++++++++------------
shell/query.js | 38 +-
shell/servers.js | 150 +-
shell/utils.cpp | 504 ++--
shell/utils.h | 23 +-
shell/utils.js | 54 +-
stdafx.cpp | 2 +-
stdafx.h | 1 +
tools/bridge.cpp | 2 +
tools/dump.cpp | 4 +-
tools/export.cpp | 4 +-
tools/files.cpp | 2 +
tools/import.cpp | 59 +-
tools/restore.cpp | 39 +-
tools/sniffer.cpp | 107 +-
tools/stat.cpp | 194 ++
tools/tool.cpp | 410 +--
tools/tool.h | 23 +-
util/allocator.h | 12 -
util/array.h | 104 +
util/assert_util.cpp | 46 +-
util/assert_util.h | 37 +-
util/atomic_int.h | 100 +
util/background.cpp | 4 +-
util/background.h | 3 +-
util/base64.cpp | 39 +-
util/base64.h | 37 +
util/builder.h | 8 +-
util/debug_util.cpp | 2 +-
util/file_allocator.h | 39 +-
util/goodies.h | 248 +-
util/hashtab.h | 2 +-
util/{httpclient.h => hex.h} | 24 +-
util/httpclient.cpp | 87 +-
util/httpclient.h | 28 +-
util/log.h | 7 +-
util/message.cpp | 42 +-
util/message.h | 34 +-
util/message_server_asio.cpp | 82 +-
util/message_server_port.cpp | 2 +
util/miniwebserver.cpp | 31 +-
util/miniwebserver.h | 7 +-
util/mmap.cpp | 25 +-
util/mmap.h | 9 +-
util/mmap_mm.cpp | 7 +-
util/mmap_posix.cpp | 14 +-
util/mmap_win.cpp | 26 +-
util/optime.h | 23 +
util/processinfo.h | 3 +
util/processinfo_darwin.cpp | 26 +-
util/processinfo_linux2.cpp | 21 +
util/processinfo_none.cpp | 9 +
util/processinfo_win32.cpp | 10 +
util/queue.h | 12 +-
util/sock.cpp | 4 +-
util/sock.h | 10 +-
util/thread_pool.cpp | 10 +-
util/thread_pool.h | 2 +-
util/top.cpp | 18 -
util/util.cpp | 18 +-
356 files changed, 20001 insertions(+), 6814 deletions(-)
diff --cc debian/changelog
index 34d3d1f,d99fb63..6da2ed2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,36 +1,31 @@@
- mongodb (1.3.1-4) unstable; urgency=low
+ mongodb (1.4.0) unstable; urgency=low
- * added conflicts with mongodb-1.2
- Please refer to Bug #570148 for clarification.
+ * stable release
- -- Antonin Kral <A.Kral at sh.cvut.cz> Wed, 17 Feb 2010 11:54:37 +0100
+ -- Richard Kreuter <richard at 10gen.com> Wed, 22 Mar 2010 16:56:28 -0500
- mongodb (1.3.1-3) unstable; urgency=low
+ mongodb (1.3.5) unstable; urgency=low
- * [ff792f5] Reordered Build-Depends to enable automated with buildd
- (Closes: #570072)
- * [4d5a2c1] Added support of nostrip and debug DEB_BUILD_OPTIONS
- (Closes: #570077)
- * [cbc4e8b] Describe why is mongodb available for some architectures
- only (Closes: #570076)
+ * bug fixes
- -- Antonin Kral <A.Kral at sh.cvut.cz> Tue, 16 Feb 2010 21:59:56 +0100
+ -- Richard Kreuter <richard at 10gen.com> Wed, 22 Mar 2010 16:56:28 -0500
- mongodb (1.3.1-2) unstable; urgency=low
+ mongodb (1.3.4) unstable; urgency=low
- * [efabc21] change order of build deps of xul-runner to fix sbuild
- (Closes: #569417)
- * [55e3c9b] added support for mongod config file
- * [88a7135] added README.Debian with note about bind_ip set to
- localhost
+ * bufg fixes
- -- Antonin Kral <A.Kral at sh.cvut.cz> Fri, 12 Feb 2010 09:37:23 +0100
+ -- Richard Kreuter <richard at 10gen.com> Wed, 17 Mar 2010 16:56:28 -0500
- mongodb (1.3.1-1) unstable; urgency=low
+ mongodb (1.3.3) unstable; urgency=low
- * Initial release (Closes: #523937)
- * [5cd4d87] rebuild original sources to remove debian/files
- * [4a84263] Removed empty preinst
- * [9698ffb] Changed maintainer of the package
- * [4486a47] mongo should build only on i386 and amd64
- * [5842c04] no need for creating home-dir for mongo user
- * [f47e39e] Added missing manpages
- * [987cd73] generate list of manpages
- * [e3336d8] used more specific build-depeneds, thanks to Richard
- Kreuter <richard at 10gen.com>
- * [ba8697c] removed unnecessary jars dir with its content
- * [91fe1cf] cover licensing terms of used components
- * [d59c02f] init.d cleanup
- * [78d712b] cover licensing terms of utils/md5.[ch]
- * [a696359] removed lib/ from upstream
+ * geo
- -- Antonin Kral <A.Kral at sh.cvut.cz> Fri, 29 Jan 2010 19:48:45 +0100
+ -- Richard Kreuter <richard at 10gen.com> Fri, 05 Feb 2010 16:56:28 -0500
+ mongodb (1.3.2) unstable; urgency=low
+
+ * munged debian files
+
+ -- Richard Kreuter <richard at 10gen.com> Fri, 05 Feb 2010 16:56:28 -0500
+
+ mongodb (1.3.1) unstable; urgency=low
-
- * Initial release
-
- -- Kristina Chodorow <kristina at 10gen.com> Tue, 07 Apr 2009 10:18:58 -0400
-
diff --cc debian/control
index 93befec,2aef1c3..fd34a31
--- a/debian/control
+++ b/debian/control
@@@ -1,9 -1,9 +1,9 @@@
Source: mongodb
-Section: devel
+Section: database
Priority: optional
- Maintainer: Antonin Kral <A.Kral at sh.cvut.cz>
- Build-Depends: debhelper (>= 7), libpcre3, libpcre3-dev, scons, xulrunner-dev (>= 1.9) | xulrunner-1.9-dev | xulrunner-1.9.1-dev, libboost1.40-dev | libboost1.35-dev | libboost1.37-dev | libboost1.38-dev, libboost-thread1.40-dev | libboost-thread1.38-dev | libboost-thread1.37-dev | libboost-thread1.35-dev, libboost-filesystem1.40-dev | libboost-filesystem1.38-dev | libboost-filesystem1.37-dev | libboost-filesystem1.35-dev, libboost-program-options1.40-dev | libboost-program-options1.38- [...]
- Standards-Version: 3.8.4
+ Maintainer: Richard Kreuter <richard at 10gen.com>
+ Build-Depends: debhelper (>= 7), libpcre3, libpcre3-dev, scons, xulrunner-dev, libboost1.35-dev | libboost1.37-dev | libboost1.38-dev | libboost1.40-dev, libboost-thread1.35-dev | libboost-thread1.37-dev | libboost-thread1.38-dev | libboost-thread1.40-dev, libboost-filesystem1.35-dev | libboost-filesystem1.37-dev | libboost-filesystem1.38-dev | libboost-filesystem1.40-dev, libboost-program-options1.35-dev | libboost-program-options1.37-dev | libboost-program-options1.38-dev | libboost-p [...]
+ Standards-Version: 3.8.0
Homepage: http://www.mongodb.org
Package: mongodb
diff --cc debian/mongodb.conf
index 0ffe523,6a5de05..9bd2464
--- a/debian/mongodb.conf
+++ b/debian/mongodb.conf
@@@ -1,12 -1,95 +1,110 @@@
++<<<<<<< HEAD
+# This is an config file for MongoDB master daemon mongod
+# it is passed to mongod as --config parameter
+
+# Log and DB path are set in init.d script
+# logpath = /var/log/mongodb/mongod.log
+# dbpath = /var/lib/mongodb/
+
+# use 'true' for options that don't take an argument
+logappend = true
+bind_ip = 127.0.0.1
+#noauth = true
+
++=======
+ # mongodb.conf
+
+ # Where to store the data.
+
+ # Note: if you run mongodb as a non-root user (recommended) you may
+ # need to create and set permissions for this directory manually,
+ # e.g., if the parent directory isn't mutable by the mongodb user.
+ dbpath=/var/lib/mongodb
+
+ #where to log
+ logpath=/var/log/mongodb/mongodb.log
+
+ logappend=true
+
+ #port = 27017
+
+
+
+ # Enables periodic logging of CPU utilization and I/O wait
+ #cpu = true
+
+ # Turn on/off security. Off is currently the default
+ #noauth = true
+ #auth = true
+
+ # Verbose logging output.
+ #verbose = true
+
+ # Inspect all client data for validity on receipt (useful for
+ # developing drivers)
+ #objcheck = true
+
+ # Enable db quota management
+ #quota = true
+
+ # Set oplogging level where n is
+ # 0=off (default)
+ # 1=W
+ # 2=R
+ # 3=both
+ # 7=W+some reads
+ #oplog = 0
+
+ # Diagnostic/debugging option
+ #nocursors = true
+
+ # Ignore query hints
+ #nohints = true
+
+ # Disable the HTTP interface (Defaults to localhost:27018).
+ #nohttpinterface = true
+
+ # Turns off server-side scripting. This will result in greatly limited
+ # functionality
+ #noscripting = true
+
+ # Turns off table scans. Any query that would do a table scan fails.
+ #notablescan = true
+
+ # Disable data file preallocation.
+ #noprealloc = true
+
+ # Specify .ns file size for new databases.
+ # nssize = <size>
+
+ # Accout token for Mongo monitoring server.
+ #mms-token = <token>
+
+ # Server name for Mongo monitoring server.
+ #mms-name = <server-name>
+
+ # Ping interval for Mongo monitoring server.
+ #mms-interval = <seconds>
+
+ # Replication Options
+
+ # in replicated mongo databases, specify here whether this is a slave or master
+ #slave = true
+ #source = master.example.com
+ # Slave only: specify a single database to replicate
+ #only = master.example.com
+ # or
+ #master = true
+ #source = slave.example.com
+
+ # Address of a server to pair with.
+ #pairwith = <server:port>
+ # Address of arbiter server.
+ #arbiter = <server:port>
+ # Automatically resync if slave data is stale
+ #autoresync
+ # Custom size for replication operation log.
+ #oplogSize = <MB>
+ # Size limit for in-memory storage of op ids.
+ #opIdMem = <bytes>
++>>>>>>> upstream/1.4.0
diff --cc debian/rules
index 61f8c86,2afdfdb..0078370
mode 100755,100644..100755
--- a/debian/rules
+++ b/debian/rules
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git
More information about the Pkg-mongodb-maintainers
mailing list