Skip to content

Commit

Permalink
Merge pull request #15 from muflihun/develop
Browse files Browse the repository at this point in the history
update
  • Loading branch information
abumq authored Feb 9, 2018
2 parents e38746d + 59b1716 commit 02c9ffa
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
build
CMakeLists.txt.user
CMakeLists.txt.user*
CMakeFiles
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Change Log

## [Unreleased]
- License information update

## [1.0.1] - 06-10-2017
### Changes
- Compatibility with residue v1.2.0
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2017 Muflihun Labs
Copyright 2017-present Muflihun Labs

https://github.com/muflihun/
https://muflihun.com
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This section shows you steps to install residue C++ client on your machine.

## Dependencies
* C++11 (or higher)
* Boost v1.59 or higher [Components: [system](http://www.boost.org/doc/libs/1_62_0/libs/system/doc/index.html)]
* Boost v1.53 or higher [Components: [system](http://www.boost.org/doc/libs/1_62_0/libs/system/doc/index.html)]
* [Easylogging++](https://github.com/muflihun/easyloggingpp) v9.95.0
* [Crypto++](https://www.cryptopp.com/) v5.6.5+ [with Pem Pack](https://raw.githubusercontent.com/muflihun/muflihun.github.io/master/downloads/pem_pack.zip)
* [CMake Toolchains](https://cmake.org/) v2.8.12
Expand Down Expand Up @@ -149,7 +149,7 @@ This will essentially join all the object files from both the libraries (no name
## License

```
Copyright 2017 Muflihun Labs
Copyright 2017-present Muflihun Labs
https://github.com/muflihun/
https://muflihun.github.io
Expand Down
2 changes: 1 addition & 1 deletion samples/detailed-cmake/src/app.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ int main(int argc, char* argv[]) {

std::cout << Residue::info() << std::endl;

#if 1 // minimal sample with unknown logger
#if 0 // minimal sample with unknown logger
try {
Residue::connect("residue-demo.muflihun.com", Residue::DEFAULT_PORT);
} catch (const ResidueException& e) {
Expand Down
2 changes: 1 addition & 1 deletion samples/minimal/conf.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"url": "residue-demo.muflihun.com:8777",
"url": "localhost:8777",
"access_codes": [
{
"logger_id": "sample-app",
Expand Down
4 changes: 3 additions & 1 deletion src/Residue.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
//
// Official C++ client library for Residue logging server
//
// Copyright (C) 2017 Muflihun Labs
// Copyright (C) 2017-present Muflihun Labs
//
// Author: @abumusamq
//
// https://muflihun.com
// https://muflihun.github.io/residue
Expand Down

0 comments on commit 02c9ffa

Please sign in to comment.