Merge branch 'master' of ssh://git.10gen.com/data/gitroot/pr0.0.9_rc1

1 files changed, 17 insertions, 2 deletions

diff --git a/db/query.h b/db/query.h
index aa06fa04105..562a2ee4e39 100644
--- a/db/query.h
+++ b/db/query.h
@@ -1,5 +1,21 @@
 // query.h
 
+/**
+*    Copyright (C) 2008 10gen Inc.
+*  
+*    This program is free software: you can redistribute it and/or  modify
+*    it under the terms of the GNU Affero General Public License, version 3,
+*    as published by the Free Software Foundation.
+*  
+*    This program is distributed in the hope that it will be useful,
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*    GNU Affero General Public License for more details.
+*  
+*    You should have received a copy of the GNU Affero General Public License
+*    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #pragma once
 
 #include "../stdafx.h"
@@ -73,7 +89,6 @@ QueryResult* runQuery(Message&, const char *ns, int ntoskip, int ntoreturn,
 					  stringstream&);
 
 void updateObjects(const char *ns, JSObj updateobj, JSObj pattern, bool upsert, stringstream& ss);
-void deleteObjects(const char *ns, JSObj pattern, bool justOne);
+int deleteObjects(const char *ns, JSObj pattern, bool justOne, bool god=false);
 
 #include "clientcursor.h"
-