From 5ca7ceb378cab9c1c6ca6dd353d48d20d2dc1ee9 Mon Sep 17 00:00:00 2001 From: Jake Omann Date: Tue, 3 Jan 2017 03:55:54 -0600 Subject: [PATCH] Update for next release --- CHANGES.rst | 2 +- CONTRIBUTING.rst | 2 +- LICENSE.rst | 2 +- README.rst | 3 ++- agent/build_resources/ncpa.nsi | 2 +- build/Makefile | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 0a7750466..220090e60 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,7 @@ Changelog +++++++++ -2.0.1 - 12/??/2016 +2.0.1 - 01/03/2017 ================== - Updated popover info boxes so they auto-hide when no longer in focus (once you click anywhere but the ?) - Updated Windows service log file locations to var/log/win32service_ncpa.log (logs for the services not NCPA) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index a3986fdc9..4424acc2c 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -25,7 +25,7 @@ been installed and working. You will need to install git for windows. Then, download and install: -* `Python 2.7.12 on Windows `_ +* `Python 2.7.13 on Windows `_ * OpenSSL for Windows (`Download `_) To set up the python requirements, in `cmd.exe` clone the NCPA repo and run:: diff --git a/LICENSE.rst b/LICENSE.rst index d7a3c90eb..ad294d95d 100644 --- a/LICENSE.rst +++ b/LICENSE.rst @@ -1,6 +1,6 @@ Nagios Open Software License Version 1.3 -Copyright (c) 2010-2016 Nagios Enterprises, LLC +Copyright (c) 2010-2017 Nagios Enterprises, LLC Nagios Enterprises, LLC (the "Company") hereby grants, free of charge, to any person, company, or legal entity (each a "User") obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software (each a "Use"), and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.rst b/README.rst index 46277fc29..8c94d08b4 100644 --- a/README.rst +++ b/README.rst @@ -11,6 +11,8 @@ Current versions: +---------+-------------+----------------------------------------------------------------------+ | Current | **2.0.0** | `Downloads `_ | +---------+-------------+----------------------------------------------------------------------+ +| Dev | **2.0.1** | `Downloads `_ @@ -36,7 +38,6 @@ Documentation You can view the most current `HTML documentation `_ online or view your current NCPA version's documentation using the NCPA web GUI from an installed agent. This is recommended if you are using an older version, since some features may not be available but may be used in newer documents. - Advanced -------- diff --git a/agent/build_resources/ncpa.nsi b/agent/build_resources/ncpa.nsi index 484f1b73b..ecce007f5 100644 --- a/agent/build_resources/ncpa.nsi +++ b/agent/build_resources/ncpa.nsi @@ -70,7 +70,7 @@ VIProductVersion ${NCPA_VERSION_CLEAN}.0 VIAddVersionKey "ProductName" "${NAME}" VIAddVersionKey "CompanyName" "${COMPANY}" VIAddVersionKey "FileVersion" ${NCPA_VERSION} -VIAddVersionKey "LegalCopyright" "2014-2016 ${COMPANY}" +VIAddVersionKey "LegalCopyright" "2014-2017 ${COMPANY}" VIAddVersionKey "FileDescription" "NCPA Setup" ; Language values for pages diff --git a/build/Makefile b/build/Makefile index 9c723e9bb..a1d0e060b 100644 --- a/build/Makefile +++ b/build/Makefile @@ -43,9 +43,9 @@ build_spec: build_tarball cat ncpa-partial.spec | sed s/__VERSION__/$(NCPAVER)/g | sed s@__BUILDROOT__@$(BUILDROOT)@g > ncpa.spec clean: - rm -rf ncpa-$(NCPAVER) + rm -rf ncpa-* rm -rf $(BASEDIR)/agent/build - rm -rf NCPA-INSTALL-$(NCPAVER) + rm -rf NCPA-INSTALL-* rm -f *.rpm rm -f *.dmg rm -f *.deb