Merge branch 'develop' into stable

driskell · Sep 23, 2014 · 909c267 · 909c267
2 parents bd258d7 + 515f1da
commit 909c267
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md
@@ -4,16 +4,23 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
 
+- [Latest Development](#latest-development)
 - [0.14](#014)
 - [0.13](#013)
 - [0.12](#012)
 - [0.11](#011)
 - [0.10](#010)
 - [0.9](#09)
-- [Pre-release](#pre-release)
+- [Pre-0.10](#pre-010)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+## 0.15
+
+*23rd September 2014*
+
+* Fix admin being enabled by default when it shouldn't be (#46)
+
 ## 0.14
 
 *18th September 2014*
@@ -42,6 +49,11 @@ JrJackson parse mode from string to raw+bigdecimal
 * Gracefully handle lines greater than 1 MiB in size by splitting and tagging
 them, and make the size configurable (#40)
 
+**Known Issues**
+
+* Admin is enabled by default when it shouldn't be. Workaround: Set the
+"admin enabled" general configuration option to false.
+
 ## 0.13
 
 *30th August 2014*
@@ -139,7 +151,7 @@ not forever
 * Enable comments inside the configuration file
 * Reduce unnecessary logging
 
-## Pre-release
+## Pre-0.10
 
 The following are fixes present in the Driskell fork of Logstash Forwarder 0.3.1
 which Log Courier builds upon.

diff --git a/log-courier.gemspec b/log-courier.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name              = 'log-courier'
-  gem.version           = '0.14'
+  gem.version           = '0.15'
   gem.description       = 'Log Courier library'
   gem.summary           = 'Receive events from Log Courier and transmit between LogStash instances'
   gem.homepage          = 'https://github.com/driskell/log-courier'

diff --git a/src/lc-lib/core/config.go b/src/lc-lib/core/config.go
@@ -32,7 +32,7 @@ import (
 )
 
 const (
-  default_GeneralConfig_AdminEnabled       bool          = true
+  default_GeneralConfig_AdminEnabled       bool          = false
   default_GeneralConfig_AdminBind          string        = "tcp:127.0.0.1:1234"
   default_GeneralConfig_PersistDir         string        = "."
   default_GeneralConfig_ProspectInterval   time.Duration = 10 * time.Second

diff --git a/src/lc-lib/core/version.go b/src/lc-lib/core/version.go
@@ -16,4 +16,4 @@
 
 package core
 
-const Log_Courier_Version string = "0.14"
+const Log_Courier_Version string = "0.15"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@

		package core

		const Log_Courier_Version string = "0.14"
		const Log_Courier_Version string = "0.15"