carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chenliang...@apache.org
Subject [1/3] carbondata-site git commit: Updated the User and Dev Mail Chains and CarbonScript file
Date Fri, 12 May 2017 12:27:10 GMT
Repository: carbondata-site
Updated Branches:
  refs/heads/asf-site 51c60829c -> b370052b3


Updated the User and Dev Mail Chains and CarbonScript file


Project: http://git-wip-us.apache.org/repos/asf/carbondata-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata-site/commit/8220913d
Tree: http://git-wip-us.apache.org/repos/asf/carbondata-site/tree/8220913d
Diff: http://git-wip-us.apache.org/repos/asf/carbondata-site/diff/8220913d

Branch: refs/heads/asf-site
Commit: 8220913d59b9da116308ddc8ee2c053d1fdc2bd9
Parents: 51c6082
Author: PallaviSingh1992 <pallavisingh_1992@yahoo.co.in>
Authored: Fri May 12 12:51:37 2017 +0530
Committer: PallaviSingh1992 <pallavisingh_1992@yahoo.co.in>
Committed: Fri May 12 13:05:29 2017 +0530

----------------------------------------------------------------------
 carbonscript.sh                                 |  2 +-
 src/main/scala/MdFilehandler.scala              | 54 --------------------
 src/main/webapp/configuration-parameters.html   |  4 --
 src/main/webapp/css/style.css                   | 11 ++++
 src/main/webapp/data-management.html            |  6 +--
 .../webapp/ddl-operation-on-carbondata.html     | 12 ++---
 .../webapp/dml-operation-on-carbondata.html     |  4 --
 src/main/webapp/faq.html                        |  6 +--
 .../webapp/file-structure-of-carbondata.html    |  6 +--
 src/main/webapp/index.html                      | 36 +++++++------
 src/main/webapp/installation-guide.html         |  6 +--
 src/main/webapp/js/custom.js                    | 10 ++--
 src/main/webapp/quick-start-guide.html          |  4 --
 .../supported-data-types-in-carbondata.html     |  4 --
 src/main/webapp/troubleshooting.html            |  6 +--
 src/main/webapp/useful-tips-on-carbondata.html  |  4 --
 16 files changed, 45 insertions(+), 130 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/carbonscript.sh
----------------------------------------------------------------------
diff --git a/carbonscript.sh b/carbonscript.sh
index b1ad576..0ec7143 100755
--- a/carbonscript.sh
+++ b/carbonscript.sh
@@ -1,5 +1,5 @@
 mvn compile
 
-mvn exec:java -Dexec.mainClass=FileOperationMain
+mvn exec:java -Dexec.mainClass=WebsiteLauncher
 
 mvn install

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/scala/MdFilehandler.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/MdFilehandler.scala b/src/main/scala/MdFilehandler.scala
deleted file mode 100644
index 6fae74e..0000000
--- a/src/main/scala/MdFilehandler.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-import com.google.inject.Inject
-import org.slf4j.{Logger, LoggerFactory}
-import services.{FileService, ConfService}
-
-import scala.util.matching.Regex
-
-class MdFileHandler @Inject()(confService: ConfService, fileService: FileService) {
-
-  val logger: Logger = LoggerFactory.getLogger(classOf[MdFileHandler])
-
-  /**
-    * converts .md extension to .html extension
-    * changes location of image from local to git repository
-    *
-    * @param input
-    * @return contents of file
-    */
-  def convertMdExtensions(input: String): String = {
-    val modifyContentPattern: Regex = new Regex("id=\"user-content-")
-    val modifyMdPattern: Regex = new Regex(".md")
-    val modifyImagePattern: Regex = new Regex("<img src=\"../docs")
-    val modifyHttpsFileLink: Regex ="""(<a href=\"https)://([a-zA-Z0-9-/.]+)(\")""".r
-    val modifyHttpFileLink: Regex ="""(<a href=\"http)://([a-zA-Z0-9-/.]+)(\")""".r
-    val replacingImageContent: String = "<img src=\"https://github.com/apache/carbondata/blob/master/docs"
-    val contentAfterRemovingUserContent: String = modifyContentPattern replaceAllIn(input,
"id=\"")
-    val contentAfterReplacingId: String = modifyMdPattern replaceAllIn(contentAfterRemovingUserContent,
".html")
-    val contentAfterReplacingImage: String = modifyImagePattern replaceAllIn(contentAfterReplacingId,replacingImageContent)
-    val contentAfterReplacingHttpsFileLink: String = modifyHttpsFileLink replaceAllIn(contentAfterReplacingImage,
"$1://$2$3 target=_blank")
-    val contentAfterReplacingFileLink: String = modifyHttpFileLink replaceAllIn(contentAfterReplacingHttpsFileLink,
"$1://$2$3 target=_blank")
-    contentAfterReplacingFileLink
-  }
-
-  /**
-    * This handles the exeception cases for retaining .md extensions in some files
-    *
-    * @return list of files
-    */
-  def convertReadMeExtensions(): List[String] = {
-    val listOfFiles: List[String] = confService.readListOfString("fileListToRetain")
-    logger.info(s"List of files to retain .md extensions : $listOfFiles")
-    val location: String = confService.readString("outputFileLocation")
-    val outputFileExtension: String = ".html"
-    val modifyMdPattern: Regex = new Regex("(README)(.html)")
-    listOfFiles.map { file =>
-      val fileURLContent: String = fileService.readFromFile("src/main/webapp/" + file + outputFileExtension)
-      val fileContent: String = modifyMdPattern replaceAllIn(fileURLContent, "$1.md")
-      fileService.writeToFile(location + file + outputFileExtension, fileContent)
-      fileContent
-    }
-
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/configuration-parameters.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/configuration-parameters.html b/src/main/webapp/configuration-parameters.html
index 66d3da3..b943b31 100644
--- a/src/main/webapp/configuration-parameters.html
+++ b/src/main/webapp/configuration-parameters.html
@@ -76,11 +76,7 @@
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                    target="_blank">Contributing to CarbonData</a></li>
                             <li>
-<<<<<<< HEAD
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
-=======
-                                <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
->>>>>>> pr-34
                                    target="_blank">Release Guide</a></li>
                             <li>
                                 <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/css/style.css
----------------------------------------------------------------------
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
index 3c47323..2ca00be 100644
--- a/src/main/webapp/css/style.css
+++ b/src/main/webapp/css/style.css
@@ -42,6 +42,17 @@ img{ max-width:100%; height:auto}
 .container-fluid{ max-width: 1180px}
 .container-fluid-full{ max-width: 100%}
 
+.cd-mail-btn {
+    font-size: 13px;
+    color: #ff943d;
+    clear: both;
+    text-transform: capitalize;
+    font-weight: 800;
+    margin: 13px;
+}
+.cd-mail-btn:hover{
+    color: #00a0d2;
+}
 
 
 .getmore-btn, .knowmore-btn, .join-community{display: block; background: #ff943d; border-radius:
4px; padding: 12px 40px; text-decoration: none;

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/data-management.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/data-management.html b/src/main/webapp/data-management.html
index d0e1611..d146952 100644
--- a/src/main/webapp/data-management.html
+++ b/src/main/webapp/data-management.html
@@ -76,11 +76,7 @@
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                    target="_blank">Contributing to CarbonData</a></li>
                             <li>
-<<<<<<< HEAD
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
-=======
-                                <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
->>>>>>> pr-34
                                    target="_blank">Release Guide</a></li>
                             <li>
                                 <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
@@ -356,7 +352,7 @@ run parallel with data load. There are 2 levels in minor compaction.</p>
 <td>carbon.numberof.preserve.segments</td>
 <td>0</td>
 <td>Minor/Major</td>
-<td>If the user wants to preserve some number of segments from being compacted then
he can set this property. Example: carbon.numberof.preserve.segments=2 then 2 latest segments
will always be excluded from the compaction. No segments will be preserved by default.</td>
+<td>This property configures number of segments to preserve from being compacted. Example:
carbon.numberof.preserve.segments=2 then 2 latest segments will always be excluded from the
compaction. No segments will be preserved by default.</td>
 <td>0-100</td>
 </tr>
 <tr>

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/ddl-operation-on-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/ddl-operation-on-carbondata.html b/src/main/webapp/ddl-operation-on-carbondata.html
index 04fdb51..4a94fa8 100644
--- a/src/main/webapp/ddl-operation-on-carbondata.html
+++ b/src/main/webapp/ddl-operation-on-carbondata.html
@@ -76,11 +76,7 @@
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                    target="_blank">Contributing to CarbonData</a></li>
                             <li>
-<<<<<<< HEAD
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
-=======
-                                <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
->>>>>>> pr-34
                                    target="_blank">Release Guide</a></li>
                             <li>
                                 <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
@@ -267,7 +263,7 @@ If you do not specify this value in the DDL command, default value is
used.</p>
 <ul>
 <li>
 <p><strong>Inverted Index Configuration</strong></p>
-<p>Inverted index is very useful to improve compression ratio and query speed, especially
for those low-cardinality columns who are in reward position.
+<p>Inverted index is very useful to improve compression ratio and query speed, especially
for those low-cardinality columns which are in reward position.
 By default inverted index is enabled. The user can disable the inverted index creation for
some columns.</p>
 </li>
 </ul>
@@ -533,7 +529,7 @@ By default inverted index is enabled. The user can disable the inverted
index cr
 <a id="valid-scenarios" class="anchor" href="#valid-scenarios" aria-hidden="true"><span
aria-hidden="true" class="octicon octicon-link"></span></a>Valid Scenarios</h4>
 <ul>
 <li>
-<p>Invalid scenario - Change of decimal precision from (10,2) to (10,5) is not valid
as in this case only scale is increased but total number of digits remain the same.</p>
+<p>Invalid scenario - Change of decimal precision from (10,2) to (10,5) is invalid
as in this case only scale is increased but total number of digits remains the same.</p>
 </li>
 <li>
 <p>Valid scenario - Change of decimal precision from (10,2) to (12,3) is valid as the
total number of digits are increased by 2 but scale is increased only by 1 which will not
lead to any data loss.</p>
@@ -631,7 +627,7 @@ By default inverted index is enabled. The user can disable the inverted
index cr
 <a id="bucketing" class="anchor" href="#bucketing" aria-hidden="true"><span aria-hidden="true"
class="octicon octicon-link"></span></a>BUCKETING</h2>
 <p>Bucketing feature can be used to distribute/organize the table/partition data into
multiple files such
 that similar records are present in the same file. While creating a table, a user needs to
specify the
-columns to be used for bucketing and the number of buckets. For the selction of bucket the
Hash value
+columns to be used for bucketing and the number of buckets. For the selection of bucket the
Hash value
 of columns is used.</p>
 <pre><code>   CREATE TABLE [IF NOT EXISTS] [db_name.]table_name
                     [(col_name data_type, ...)]
@@ -676,7 +672,7 @@ of columns is used.</p>
 </li>
 </ul>
 <h3>
-<a id="example-" class="anchor" href="#example-" aria-hidden="true"><span aria-hidden="true"
class="octicon octicon-link"></span></a>Example :</h3>
+<a id="example-3" class="anchor" href="#example-3" aria-hidden="true"><span aria-hidden="true"
class="octicon octicon-link"></span></a>Example:</h3>
 <pre><code> CREATE TABLE IF NOT EXISTS productSchema.productSalesTable (
                                 productNumber Int,
                                 saleQuantity Int,

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/dml-operation-on-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/dml-operation-on-carbondata.html b/src/main/webapp/dml-operation-on-carbondata.html
index 830fb3e..c404840 100644
--- a/src/main/webapp/dml-operation-on-carbondata.html
+++ b/src/main/webapp/dml-operation-on-carbondata.html
@@ -76,11 +76,7 @@
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                    target="_blank">Contributing to CarbonData</a></li>
                             <li>
-<<<<<<< HEAD
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
-=======
-                                <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
->>>>>>> pr-34
                                    target="_blank">Release Guide</a></li>
                             <li>
                                 <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/faq.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/faq.html b/src/main/webapp/faq.html
index 5e9f490..ce933ef 100644
--- a/src/main/webapp/faq.html
+++ b/src/main/webapp/faq.html
@@ -76,11 +76,7 @@
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                    target="_blank">Contributing to CarbonData</a></li>
                             <li>
-<<<<<<< HEAD
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
-=======
-                                <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
->>>>>>> pr-34
                                    target="_blank">Release Guide</a></li>
                             <li>
                                 <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
@@ -263,7 +259,7 @@ id  city    name
 <pre><code>INSERT INTO TABLE carbon_table SELECT id, city FROM source_table;
 </code></pre>
 <p><strong>Scenario 3</strong> :</p>
-<p>When the column type in carbon table is different from from the column specified
in select statement. The insert operation will still success, but you may get NULL in result,
because NULL will be substitute value when conversion type failed.</p>
+<p>When the column type in carbon table is different from the column specified in select
statement. The insert operation will still success, but you may get NULL in result, because
NULL will be substitute value when conversion type failed.</p>
 </div>
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/file-structure-of-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/file-structure-of-carbondata.html b/src/main/webapp/file-structure-of-carbondata.html
index 30d3c6f..996d6f5 100644
--- a/src/main/webapp/file-structure-of-carbondata.html
+++ b/src/main/webapp/file-structure-of-carbondata.html
@@ -76,11 +76,7 @@
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                    target="_blank">Contributing to CarbonData</a></li>
                             <li>
-<<<<<<< HEAD
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
-=======
-                                <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
->>>>>>> pr-34
                                    target="_blank">Release Guide</a></li>
                             <li>
                                 <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
@@ -177,7 +173,7 @@
 <li>File Header : It contains CarbonData file version number, list of column schema
and schema updation timestamp.</li>
 <li>File Footer : it contains Number of rows, segmentinfo ,all blocklets? info and
index, you can find the detail from the below diagram.</li>
 <li>Blocklet : Rows are grouped to form a blocklet, the size of the blocklet is configurable
and default size is 64MB, Blocklet contains Column Page groups for each column.</li>
-<li>Column Page Group : Data of one column and it is further divided to pages, it is
guaranteed to be contiguous in file.</li>
+<li>Column Page Group : Data of one column and it is further divided into pages, it
is guaranteed to be contiguous in file.</li>
 <li>Page : It has the data of one column and the number of row is fixed to 32000 size.</li>
 </ul>
 <p><a href="../docs/images/carbon_data_format_new.png?raw=true" target="_blank"><img
src="https://github.com/apache/carbondata/blob/master/docs/images/carbon_data_format_new.png?raw=true"
alt="CarbonData File Format" style="max-width:100%;"></a></p>

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 2f9db8c..e313d38 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -395,24 +395,9 @@
                                         to join the community and contribute to CarbonData.
 
                                     </p>
-                                    <p class="title-info">It is very easy to join CarbonData
community:
-                                    </p>
+                                   <!-- <p class="title-info">It is very easy to
join CarbonData community:
+                                    </p>-->
                                     <ul class="listlink">
-                                        <li> Subscribe for the developers mailing list
by sending an email to
-                                            <a href="mailto:dev-subscribe@carbondata.apache.org"
-                                               target="_blank">dev-subscribe@carbondata.apache.org</a>
-                                        </li>
-                                        <li>Subscribe for the users mailing list by
sending an email to
-                                            <a href="mailto:user-subscribe@carbondata.apache.org"
-                                               target="_blank">user-subscribe@carbondata.apache.org</a>
-                                        </li>
-                                        <li> After you subscribe, you can discuss your
ideas, queries, and issues by
-                                            sending an email to
-                                            <a href="mailto:dev@carbondata.apache.org"
target="_blank">dev@carbondata.apache.org</a>
-                                            or visit <a
-                                                    href="http://apache-carbondata-mailing-list-archive.1130556.n5.nabble.com"
-                                                    target="_blank">http://apache-carbondata-mailing-list-archive.1130556.n5.nabble.com</a>
-                                        </li>
                                         <li> To start contributing to CarbonData and
be a contributor, see <a
                                                 href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                                 target="_blank">Contributing to Apache
CarbonData</a>.
@@ -422,6 +407,22 @@
                                                 target="_blank">Apache Jira</a>.
                                         </li>
                                     </ul>
+                                    <h4 class="title">Mailing Lists
+                                        <span class="title-underline"></span>
+                                    </h4>
+                                    <ul class="listlink">
+                                        <li>For questions, help and announcements related
to Usage, use <a href="mailto:user@carbondata.apache.org" target="_blank">user@carbondata.apache.org</a>
+                                            <a href="mailto:user-subscribe@carbondata.apache.org"
class="cd-mail-btn" style="margin-left: 20px">Subscribe</a>
+                                            <a href="mailto:user-unsubscribe@carbondata.apache.org"
class="cd-mail-btn">Unsubscribe</a>
+                                            <a href="http://apache-carbondata-mailing-list-archive.1130556.n5.nabble.com"
class="cd-mail-btn">Archives</a>
+                                        </li>
+                                        <li>People wanting to contribute to Apache
CarbonData should use  <a href="mailto:dev@carbondata.apache.org" target="_blank">dev@carbondata.apache.org</a>
+                                            <a href="mailto:dev-subscribe@carbondata.apache.org"
class="cd-mail-btn" style="margin-left: 20px">Subscribe</a>
+                                            <a href="mailto:dev-unsubscribe@carbondata.apache.org"
class="cd-mail-btn">Unsubscribe</a>
+                                            <a href="http://apache-carbondata-mailing-list-archive.1130556.n5.nabble.com"
class="cd-mail-btn">Archives</a>
+                                        </li>
+                                    </ul>
+
                                     <p class="social-icons">
                                         <a href="https://www.facebook.com/carbondata/"
target="_blank">
                                             <i class="fa fa-facebook-square" aria-hidden="true"></i></a>
@@ -430,6 +431,7 @@
                                         <a href="https://www.linkedin.com/groups/10334501"
target="_blank"> <i
                                                 class="fa fa-linkedin-square" aria-hidden="true"></i></a>
                                     </p>
+
                                 </div>
                             </div>
                         </div>

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/installation-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/installation-guide.html b/src/main/webapp/installation-guide.html
index 300b6b0..5bc678f 100644
--- a/src/main/webapp/installation-guide.html
+++ b/src/main/webapp/installation-guide.html
@@ -76,11 +76,7 @@
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                    target="_blank">Contributing to CarbonData</a></li>
                             <li>
-<<<<<<< HEAD
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
-=======
-                                <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
->>>>>>> pr-34
                                    target="_blank">Release Guide</a></li>
                             <li>
                                 <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
@@ -428,7 +424,7 @@ hdfs://&lt;host_name&gt;:port/user/hive/warehouse/carbon.store
 <h3>
 <a id="connecting-to-carbondata-thrift-server-using-beeline" class="anchor" href="#connecting-to-carbondata-thrift-server-using-beeline"
aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Connecting
to CarbonData Thrift Server Using Beeline.</h3>
 <pre><code>     cd $SPARK_HOME
-     ./bin/beeline jdbc:hive2://&lt;thrftserver_host&gt;:port
+     ./bin/beeline jdbc:hive2://&lt;thriftserver_host&gt;:port
 
      Example
      ./bin/beeline jdbc:hive2://10.10.10.10:10000

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/js/custom.js
----------------------------------------------------------------------
diff --git a/src/main/webapp/js/custom.js b/src/main/webapp/js/custom.js
index e074dd4..734837b 100644
--- a/src/main/webapp/js/custom.js
+++ b/src/main/webapp/js/custom.js
@@ -15,8 +15,8 @@ $(document).ready(function(){
 
 // Documentation page perticular links from landing page
 /*-----------------------------------------------------------*/
- 
-function getParameterByName(name, url) {
+
+/*function getParameterByName(name, url) {
     if (!url) {
       url = window.location.href;
     }
@@ -26,7 +26,7 @@ function getParameterByName(name, url) {
     if (!results) return null;
     if (!results[2]) return '';
     return decodeURIComponent(results[2].replace(/\+/g, " "));
-}
+}*/
 
 // conditional loading of documentation page from landing page
 $(document).ready(function(){
@@ -59,8 +59,8 @@ $(document).ready(function(){
       pagelink ="data-management.html"
       break;
 
-      } 
-    $("#viewpage").load(pagelink);  
+      }
+    $("#viewpage").load(pagelink);
 
  });
 

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/quick-start-guide.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/quick-start-guide.html b/src/main/webapp/quick-start-guide.html
index e125977..214d3e8 100644
--- a/src/main/webapp/quick-start-guide.html
+++ b/src/main/webapp/quick-start-guide.html
@@ -76,11 +76,7 @@
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                    target="_blank">Contributing to CarbonData</a></li>
                             <li>
-<<<<<<< HEAD
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
-=======
-                                <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
->>>>>>> pr-34
                                    target="_blank">Release Guide</a></li>
                             <li>
                                 <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/supported-data-types-in-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/supported-data-types-in-carbondata.html b/src/main/webapp/supported-data-types-in-carbondata.html
index 754438a..4fdc494 100644
--- a/src/main/webapp/supported-data-types-in-carbondata.html
+++ b/src/main/webapp/supported-data-types-in-carbondata.html
@@ -76,11 +76,7 @@
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                    target="_blank">Contributing to CarbonData</a></li>
                             <li>
-<<<<<<< HEAD
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
-=======
-                                <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
->>>>>>> pr-34
                                    target="_blank">Release Guide</a></li>
                             <li>
                                 <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/troubleshooting.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/troubleshooting.html b/src/main/webapp/troubleshooting.html
index a929ae0..77ad04e 100644
--- a/src/main/webapp/troubleshooting.html
+++ b/src/main/webapp/troubleshooting.html
@@ -76,11 +76,7 @@
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                    target="_blank">Contributing to CarbonData</a></li>
                             <li>
-<<<<<<< HEAD
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
-=======
-                                <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
->>>>>>> pr-34
                                    target="_blank">Release Guide</a></li>
                             <li>
                                 <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"
@@ -252,7 +248,7 @@ For example, you can use scp to copy this file to all the nodes.</p>
 <p><strong>Procedure</strong></p>
 <p>Ensure that the Hiveuser in mysql must allow its access to the external processes.</p>
 <h2>
-<a id="failure-to-read-the-metastore-db-during-table-creation" class="anchor" href="#failure-to-read-the-metastore-db-during-table-creation"
aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Failure
to read the metastore db during table creation.</h2>
+<a id="failed-to-read-the-metastore-db-during-table-creation" class="anchor" href="#failed-to-read-the-metastore-db-during-table-creation"
aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Failed
to read the metastore db during table creation.</h2>
 <p><strong>Symptom</strong></p>
 <p>We get the following exception on trying to connect :</p>
 <pre><code>Cannot read the metastore db

http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/8220913d/src/main/webapp/useful-tips-on-carbondata.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/useful-tips-on-carbondata.html b/src/main/webapp/useful-tips-on-carbondata.html
index cc8110c..e7d9bcb 100644
--- a/src/main/webapp/useful-tips-on-carbondata.html
+++ b/src/main/webapp/useful-tips-on-carbondata.html
@@ -76,11 +76,7 @@
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md"
                                    target="_blank">Contributing to CarbonData</a></li>
                             <li>
-<<<<<<< HEAD
                                 <a href="https://github.com/apache/carbondata/blob/master/docs/release-guide.md"
-=======
-                                <a href="https://github.com/apache/incubator-carbondata/blob/master/docs/release-guide.md"
->>>>>>> pr-34
                                    target="_blank">Release Guide</a></li>
                             <li>
                                 <a href="https://cwiki.apache.org/confluence/display/CARBONDATA/PPMC+and+Committers+member+list"


Mime
View raw message