From 20d0e60317649ba277fe7cc507e5a73fb76dc499 Mon Sep 17 00:00:00 2001
From: Pyo <pyo@robotis.com>
Date: Wed, 23 Jan 2019 10:45:47 +0900
Subject: [PATCH 1/2] updated the CHANGELOG and version to release binary
 packages

Signed-off-by: Pyo <pyo@robotis.com>
---
 CHANGELOG.rst | 7 +++++++
 README.md     | 1 +
 package.xml   | 6 ++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1ad1298..eb55f5e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package hls_lfcd_lds_driver
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.1.0 (2019-01-23)
+------------------
+* added lpthread library in Makefile
+* added CI for ROS melodic
+* modified hlds_laser_segment_publisher
+* Contributors: Gilbert, Pyo
+
 1.0.0 (2018-05-29)
 ------------------
 * modified max-range to avoid fencepost error.
diff --git a/README.md b/README.md
index 0242a52..f9319ed 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@
 - [turtlebot3_autorace](https://github.com/ROBOTIS-GIT/turtlebot3_autorace)
 - [turtlebot3_deliver](https://github.com/ROBOTIS-GIT/turtlebot3_deliver)
 - [hls_lfcd_lds_driver](https://github.com/ROBOTIS-GIT/hls_lfcd_lds_driver)
+- [robotis_manipulator](https://github.com/ROBOTIS-GIT/robotis_manipulator)
 - [open_manipulator_msgs](https://github.com/ROBOTIS-GIT/open_manipulator_msgs)
 - [open_manipulator](https://github.com/ROBOTIS-GIT/open_manipulator)
 - [open_manipulator_simulations](https://github.com/ROBOTIS-GIT/open_manipulator_simulations)
diff --git a/package.xml b/package.xml
index b310b27..3ed3a19 100644
--- a/package.xml
+++ b/package.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>hls_lfcd_lds_driver</name>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
   <description>
     ROS package for LDS(HLS-LFCD2).
     The LDS (Laser Distance Sensor) is a sensor sending the data to Host for the simultaneous localization and mapping (SLAM). Simultaneously the detecting obstacle data can also be sent to Host. HLDS(Hitachi-LG Data Storage) is developing the technology for the moving platform sensor such as Robot Vacuum Cleaners, Home Robot, Robotics Lawn Mower Sensor, etc.
   </description>
   <license>BSD</license>
-  <author email="thlim@robotis.com">Darby Lim</author>
   <author email="pyo@robotis.com">Pyo</author>
+  <author email="thlim@robotis.com">Darby Lim</author>
+  <author email="kkjong@robotis.com">Gilbert</author>
   <author>JH Yang</author>
   <author>SP Kong</author>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="kkjong@robotis.com">Gilbert</maintainer>
   <url type="website">http://wiki.ros.org/hls_lfcd_lds_driver</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/hls_lfcd_lds_driver</url>

From 879689ca5ab0fde0969e12b456478cec53f8407c Mon Sep 17 00:00:00 2001
From: Pyo <pyo@robotis.com>
Date: Wed, 23 Jan 2019 10:48:33 +0900
Subject: [PATCH 2/2] added travis setting for melodic

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3c9951e..3e66a12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,12 +23,13 @@ env:
     - ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
 matrix:
   allow_failures:
-    - env: ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
     - env: ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
 branches:
   only:
     - master
     - develop
+    - kinetic-devel
+    - melodic-devel
 install:
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 script: