Merge branch 'upstream' into dev

Conflicts:
	README

6 files changed, 66 insertions, 66 deletions

diff --git a/configshell/__init__.py b/configshell/__init__.py
index 9bfcdb3..a7cbeea 100644
--- a/configshell/__init__.py
+++ b/configshell/__init__.py
@@ -1,18 +1,18 @@
 '''
-This file is part of ConfigShell Community Edition.
-Copyright (c) 2011 by RisingTide Systems LLC
+This file is part of ConfigShell.
+Copyright (c) 2011-2013 by Datera, Inc
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, version 3 (AGPLv3).
+Licensed under the Apache License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may obtain
+a copy of the License at
 
-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.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-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/>.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 '''
 
 from log import Log
diff --git a/configshell/console.py b/configshell/console.py
index 109c5a9..061853d 100644
--- a/configshell/console.py
+++ b/configshell/console.py
@@ -1,18 +1,18 @@
 '''
-This file is part of ConfigShell Community Edition.
-Copyright (c) 2011 by RisingTide Systems LLC
+This file is part of ConfigShell.
+Copyright (c) 2011-2013 by Datera, Inc
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, version 3 (AGPLv3).
+Licensed under the Apache License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may obtain
+a copy of the License at
 
-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.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-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/>.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 '''
 
 import re
diff --git a/configshell/log.py b/configshell/log.py
index 05b3a4a..67527e1 100644
--- a/configshell/log.py
+++ b/configshell/log.py
@@ -1,18 +1,18 @@
 '''
-This file is part of ConfigShell Community Edition.
-Copyright (c) 2011 by RisingTide Systems LLC
+This file is part of ConfigShell.
+Copyright (c) 2011-2013 by Datera, Inc
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, version 3 (AGPLv3).
+Licensed under the Apache License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may obtain
+a copy of the License at
 
-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.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-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/>.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 '''
 
 import os
diff --git a/configshell/node.py b/configshell/node.py
index cf2cecb..51ab2e9 100644
--- a/configshell/node.py
+++ b/configshell/node.py
@@ -1,18 +1,18 @@
 '''
-This file is part of ConfigShell Community Edition.
-Copyright (c) 2011 by RisingTide Systems LLC
+This file is part of ConfigShell.
+Copyright (c) 2011-2013 by Datera, Inc
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, version 3 (AGPLv3).
+Licensed under the Apache License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may obtain
+a copy of the License at
 
-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.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-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/>.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 '''
 
 import re
diff --git a/configshell/prefs.py b/configshell/prefs.py
index 9ddb420..d27f7b7 100644
--- a/configshell/prefs.py
+++ b/configshell/prefs.py
@@ -1,18 +1,18 @@
 '''
-This file is part of ConfigShell Community Edition.
-Copyright (c) 2011 by RisingTide Systems LLC
+This file is part of ConfigShell.
+Copyright (c) 2011-2013 by Datera, Inc
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, version 3 (AGPLv3).
+Licensed under the Apache License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may obtain
+a copy of the License at
 
-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.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-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/>.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 '''
 
 import cPickle
diff --git a/configshell/shell.py b/configshell/shell.py
index e39ec9c..a3fbbca 100644
--- a/configshell/shell.py
+++ b/configshell/shell.py
@@ -1,18 +1,18 @@
 '''
-This file is part of ConfigShell Community Edition.
-Copyright (c) 2011 by RisingTide Systems LLC
+This file is part of ConfigShell.
+Copyright (c) 2011-2013 by Datera, Inc
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, version 3 (AGPLv3).
+Licensed under the Apache License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may obtain
+a copy of the License at
 
-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.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-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/>.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
 '''
 
 import os