commit a4b2b6cb8915c1fd29cee4961c90f00dc72ee319
Author: Wim <wim@42.be>
Date: Sat Mar 25 21:35:13 2017 +0000
diff --git a/README.md b/README.md
index 03dd8a0..fcd76b5 100644
--- a/README.md
+++ b/README.md
@@ -427 +427 @@ Accounts to one of the supported bridges
# Installing
## Binaries
Binaries can be found [here] (https://github.com/42wim/matterbridge/releases/)
-* Latest release [v0.10.1](https://github.com/42wim/matterbridge/releases/latest)
+* Latest release [v0.10.2](https://github.com/42wim/matterbridge/releases/latest)
## Building
Go 1.6+ is required. Make sure you have [Go](https://golang.org/doc/install) properly installed, including setting up your [GOPATH] (https://golang.org/doc/code.html#GOPATH)
@@ -1229 +12211 @@ RemoteNickFormat="[{PROTOCOL}/{BRIDGE}] <{NICK}> "
```
# Running
-1) Copy the matterbridge.toml.sample to matterbridge.toml in the same directory as the matterbridge binary.
+1) Copy the matterbridge.toml.sample to matterbridge.toml
2) Edit matterbridge.toml with the settings for your environment.
-3) Now you can run matterbridge. (```./matterbridge```)
+3) Now you can run matterbridge. (```./matterbridge```)
+
+(Matterbridge will only look for the config file in your current directory, if it isn't there specify -conf "/path/toyour/matterbridge.toml")
```
Usage of ./matterbridge:
@@ -1326 +1348 @@ Usage of ./matterbridge:
-debug
+ -gops
+ enable gops agent
-version
```
@@ -1656 +1697 @@ Matterbridge wouldn't exist without these libraries:
* discord - https://github.com/bwmarrin/discordgo
* echo - https://github.com/labstack/echo
* gitter - https://github.com/sromku/go-gitter
+* gops - https://github.com/google/gops
* irc - https://github.com/thoj/go-ircevent
* mattermost - https://github.com/mattermost/platform
* matrix - https://github.com/matrix-org/gomatrix
diff --git a/changelog.md b/changelog.md
index 277f9b7..673a018 100644
--- a/changelog.md
+++ b/changelog.md
@@ -13 +114 @@
+# v0.10.2
+## New features
+* general: gops agent added. Allows for more debugging. See #134
+* general: toml inline table support added for config file
+
+## Bugfix
+* all: vendored libs updated
+
+## Changes
+* general: add more informative messages on startup
+
# v0.10.1
## Bugfix
* gitter: Fix sending messages on new channel join.
diff --git a/matterbridge.go b/matterbridge.go
index c9716d4..f3341ac 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -117 +117 @@ import (
)
var (
- version = "0.10.2-dev"
+ version = "0.10.2"
githash string
)