GitHub user wujinhu opened a pull request:
https://github.com/apache/incubator-eagle/pull/433
Fix conflict
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/wujinhu/incubator-eagle master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-eagle/pull/433.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #433
----
commit 9849303ebf8a63e4f54f0eb035c8060c43e50611
Author: Hao Chen <[email protected]>
Date: 2016-05-27T11:34:32Z
[EAGLE-273][EAGLE-269] Fix exceeding the maximum row size of 65,535 bytes
in mysql and comparisons between LONG_VARCHAR not supported
https://issues.apache.org/jira/browse/EAGLE-273
https://issues.apache.org/jira/browse/EAGLE-269
The problem is cause the limitation of maximum row size in mysql innodb
engine, so need to keep the column size relatively small, but it will cause it
can't store large field, it's a little tricky, so may have following possible
solutions:
* Solution One: Fix mysql innodb size to resolve the limitation.
* Solution Two: Keep the field relatively small to avoid exceeding maximum
row size and make sure creating table successfully, and modify field size
according to actual usage (Which is the approach we take for this problem)
Author: Hao Chen <[email protected]>
Closes #158 from haoch/EAGLE-273-LATEST.
commit df576452f174166407dfaa7a705b7f263f932f33
Author: hdendukuri <[email protected]>
Date: 2016-05-27T11:36:26Z
[EAGLE-279] Create Documentation for Sandbox Quick starter and JMX monitring
Create Documentation for Sandbox Quick starter and JMX monitring
Author: hdendukuri <[email protected]>
Closes #159 from hdendukuri/master.
commit 982a6b7430d349199091add264c9bef1bdc8ae35
Author: jiljiang <[email protected]>
Date: 2016-06-02T10:45:52Z
[EAGLE-219] front end documentation
Author: jiljiang <[email protected]>
Closes #171 from zombieJ/doc.
commit 4a18107af97222193468ffe4e6f1645285878a29
Author: wujinhu <[email protected]>
Date: 2016-09-12T07:19:16Z
Merge branch 'master' of https://github.com/apache/incubator-eagle
# Conflicts:
#
eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/JdbcConstants.java
# eagle-hadoop-metric/src/main/resources/safemodecheck-policy-import.sh
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
